Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 10 Jun 2010 05:30:32 +0000 (05:30 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 10 Jun 2010 05:30:32 +0000 (05:30 +0000)
commit2c486da96e797f4cfb6cde90c7450137cc6692cb
treed331e7a1f1541e791b9400a423b86b94ffb35a44
parentbf985a72c8e7a4b90f7c0a351026c334dd660bde
parenteed63bb331a49a428f1997a9a417eaec5a8eb95e
Merge from mainline.